feature(cram): allow for conflict detection #12538
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rgrinberg
force-pushed
the
ps/rr/feature_cram___allow_for_conflict_detection
branch
2 times, most recently
from
16a6b43 to
c54405c
Compare
Alizter
approved these changes
Oct 10, 2025
Collaborator
Alizter
left a comment
Alizter
left a comment
There was a problem hiding this comment.
Looks good. I have two comments about the changelog that need addressing.
rgrinberg
force-pushed
the
ps/rr/feature_cram___allow_for_conflict_detection
branch
from
c54405c to
31cad4a
Compare
Signed-off-by: Rudi Grinberg <[email protected]> <!-- ps-id: 00082b36-5b36-4379-b052-639ce733dad5 --> Signed-off-by: Rudi Grinberg <[email protected]>
rgrinberg
force-pushed
the
ps/rr/feature_cram___allow_for_conflict_detection
branch
from
31cad4a to
c68ce13
Compare
rgrinberg
deleted the
ps/rr/feature_cram___allow_for_conflict_detection
branch
Sudha247
pushed a commit
to Sudha247/dune
that referenced
this pull request
Oct 13, 2025
Signed-off-by: Rudi Grinberg <[email protected]>
davesnx
added a commit
to davesnx/dune
that referenced
this pull request
Oct 14, 2025
* 'main' of github.com:/ocaml/dune: (147 commits) cram test: test only parameter flags in merlin generation fix(oxcaml): import eta-expansion changes from opam-repo (ocaml#12563) address review comments Mask the path to the stdlib fix(oxcaml): generate merlin config for library parameters fix(melange + include_qualified): track correct `.cmj` dependencies in emit (ocaml#12531) refactor: remove some unused code in [Path] (ocaml#12558) dep_rules: don't run (transitive) `ocamldep` on single module buildables (ocaml#12555) fix(pkg): ignore project settings for building packages test(pkg): reproduce ocaml#12131 melange: add a test for module cycle checks (ocaml#12554) chore: lint check for new changes entries (ocaml#12553) feature(cram): allow for conflict detection (ocaml#12538) ci: update for ocaml 5.4 release (ocaml#12552) chore(script): generate changelog from structure (ocaml#12516) Reuse dependencies between project and tools (ocaml#12526) Introduce Io.overwrite_file test: fix dune install requiring a mandir Enable package management for more tests Add a `dune tools env` command to add dev tools to PATH (ocaml#12521) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Took a stab at: #12512
I made it a full blown error because warnings are just as annoying to deal with as errors anyway. Let's see how this works, and perhaps we'll switch this to be the new default some day.
Signed-off-by: Rudi Grinberg [email protected]